Deprecate weak crash console functions

The default behaviour of the plat_crash_console_xxx functions isn't
obvious to someone that hasn't read all the documentation. As they are
not mandatory, it is unlikely that the code will be checked when doing a
platform port, which may mean that some platforms may not have crash
console support at all.

The idea of this patch is to force platform maintainers to decide how
the crash console has to behave so that the final behaviour isn't
unexpected.

Change-Id: I40b2a7b56c5530c1dcd63eace5bd37ae6335056e
Signed-off-by: Antonio Nino Diaz <[email protected]>

diff --git a/plat/common/aarch32/platform_helpers.S b/plat/common/aarch32/platform_helpers.S
index d61853942b077a643483bf8ab3737684f902b674..e1e2a6f58ccdebb4521711e887405175e3296a85 100644 (file)
--- a/plat/common/aarch32/platform_helpers.S
+++ b/plat/common/aarch32/platform_helpers.S
@@ -8,9 +8,11 @@
 #include <asm_macros.S>
 
        .weak   plat_report_exception
+#if !ERROR_DEPRECATED
        .weak   plat_crash_console_init
        .weak   plat_crash_console_putc
        .weak   plat_crash_console_flush
+#endif
        .weak   plat_reset_handler
        .weak   plat_disable_acp
        .weak   bl1_plat_prepare_exit
@@ -26,6 +28,7 @@ func plat_report_exception
        bx      lr
 endfunc plat_report_exception
 
+#if !ERROR_DEPRECATED
        /* -----------------------------------------------------
         * Placeholder function which should be redefined by
         * each platform.
@@ -54,6 +57,7 @@ func plat_crash_console_flush
        mov     r0, #0
        bx      lr
 endfunc plat_crash_console_flush
+#endif
 
        /* -----------------------------------------------------
         * Placeholder function which should be redefined by

diff --git a/plat/common/aarch64/platform_helpers.S b/plat/common/aarch64/platform_helpers.S
index 7214588a6dbd2ebc4799c661f24cc77ba6c24ba9..d3ffcaf1923d0e1ef8151aa71a7b0083b8c42994 100644 (file)
--- a/plat/common/aarch64/platform_helpers.S
+++ b/plat/common/aarch64/platform_helpers.S
@@ -10,9 +10,11 @@
 #include <platform_def.h>
 
        .weak   plat_report_exception
+#if !ERROR_DEPRECATED
        .weak   plat_crash_console_init
        .weak   plat_crash_console_putc
        .weak   plat_crash_console_flush
+#endif
        .weak   plat_reset_handler
        .weak   plat_disable_acp
        .weak   bl1_plat_prepare_exit
@@ -37,6 +39,7 @@ func plat_report_exception
        ret
 endfunc plat_report_exception
 
+#if !ERROR_DEPRECATED
 #if MULTI_CONSOLE_API
        /* -----------------------------------------------------
         * int plat_crash_console_init(void)
@@ -109,6 +112,7 @@ func plat_crash_console_flush
        ret
 endfunc plat_crash_console_flush
 #endif
+#endif /* ERROR_DEPRECATED */
 
        /* -----------------------------------------------------
         * Placeholder function which should be redefined by